<!DOCTYPE html>
<html lang="en">
<head>
  <meta charset="UTF-8">
  <meta http-equiv="X-UA-Compatible" content="IE=edge">
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
  <title>Document</title>
  <style>
    .test{
      width: 100px;
      height: 100px;
      background: lawngreen;
    }
  </style>
</head>
<body>
  <p>测试</p>
  <div>牛逼</div>
<<<<<<< HEAD
  <div>
    大家好，我是郭杰
  </div>
  <h1>郭杰</h1>
  <p>cc</p>
  <p>fff</p>
=======
  <div>测试测试</div>

  <div class="test">heelo</div>
>>>>>>> testbranch
</body>
</html>